From 2a52c51601ba324e8fe5e570dc88ac8ee79192b5 Mon Sep 17 00:00:00 2001 From: "sos22@douglas.cl.cam.ac.uk" Date: Fri, 11 Feb 2005 12:48:22 +0000 Subject: [PATCH] bitkeeper revision 1.1181 (420ca996keP3Po6VzQplsJpxQ7eTyg) Not sure why BK didn't pick this up last time... --- .rootkeys | 2 +- xen/arch/x86/Makefile | 1 - xen/arch/x86/cdb.c | 2 +- xen/arch/x86/x86_32/{cdb_trap.S => call_with_regs.S} | 0 4 files changed, 2 insertions(+), 3 deletions(-) rename xen/arch/x86/x86_32/{cdb_trap.S => call_with_regs.S} (100%) diff --git a/.rootkeys b/.rootkeys index 6d1496d0d6..f334b55cfc 100644 --- a/.rootkeys +++ b/.rootkeys @@ -923,7 +923,7 @@ 41f97ef5139vN42cOYHfX_Ac8WOOjA xen/arch/x86/vmx_platform.c 41c0c4128URE0dxcO15JME_MuKBPfg xen/arch/x86/vmx_vmcs.c 419cbedeQDg8IrO3izo3o5rQNlo0kQ xen/arch/x86/x86_32/asm-offsets.c -4107c15e_NqNYew2EXroXz2mgTAMWQ xen/arch/x86/x86_32/cdb_trap.S +4107c15e_NqNYew2EXroXz2mgTAMWQ xen/arch/x86/x86_32/call_with_regs.S 4202391dkvdTZ8GhWXe3Gqf9EOgWXg xen/arch/x86/x86_32/domain_build.c 3e32af9aRnYGl4GMOaDKp7JdfhOGhg xen/arch/x86/x86_32/domain_page.c 3ddb79bcecupHj56ZbTa3B0FxDowMg xen/arch/x86/x86_32/entry.S diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 7513fec78d..0281991c0d 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -13,7 +13,6 @@ endif ifneq ($(crash_debug),y) OBJS := $(patsubst cdb%.o,,$(OBJS)) -OBJS := $(patsubst $(TARGET_SUBARCH)/cdb%.o,,$(OBJS)) endif default: $(TARGET) diff --git a/xen/arch/x86/cdb.c b/xen/arch/x86/cdb.c index 5a3d3e2188..458e2d64ed 100644 --- a/xen/arch/x86/cdb.c +++ b/xen/arch/x86/cdb.c @@ -317,7 +317,7 @@ xdb_ctx = { serhnd : -1 }; -void +int __trap_to_cdb(struct xen_regs *regs) { int resume = 0; diff --git a/xen/arch/x86/x86_32/cdb_trap.S b/xen/arch/x86/x86_32/call_with_regs.S similarity index 100% rename from xen/arch/x86/x86_32/cdb_trap.S rename to xen/arch/x86/x86_32/call_with_regs.S -- 2.30.2